Re-pull of fixes to prevent arm64-on-arm64 requiring unnecessary qemu-aarch64-static#261
Merged
guysoft merged 2 commits intoguysoft:develfrom Feb 18, 2026
Merged
Conversation
jxmx
changed the title
MayorBug
added a commit
to MayorBug/RatOS
that referenced
this pull request
Nov 20, 2025
Replace CustomPiOS launcher with upstream arch-fix version guysoft/CustomPiOS#261
Collaborator
|
@guysoft especially with the arm runners being available on Github this PR is valuable. I would recommend taking a look to see if it solves the issue of running arm-on-arm qemu instead of skipping it. Worth your time! |
guysoft
added a commit
that referenced
this pull request
Feb 17, 2026
…y logic The QEMU binary copy logic was duplicated between execute_chroot_script() in src/custompios and chroot_correct_qemu() in src/common.sh. The inline version in custompios also had a bug: the condition used || instead of &&, making it always true (a tautology). This commit: - Extracts the copy logic into a new setup_qemu_static() function in common.sh, fixing the || to && bug and adding arch-match escape hatches - Fixes the aarch64->armv7l case to copy qemu-arm-static (not qemu-aarch64-static) - Replaces both inline copy blocks with calls to setup_qemu_static() - Adds 24 new test cases covering all host/target/OS combinations for the QEMU binary copy logic Related to PR #261 and issue #262. Co-authored-by: Cursor <cursoragent@cursor.com>
Owner
|
I have added unit tests for that section too, will merge to devel shortly |
guysoft
added a commit
that referenced
this pull request
Feb 18, 2026
…y logic The QEMU binary copy logic was duplicated between execute_chroot_script() in src/custompios and chroot_correct_qemu() in src/common.sh. The inline version in custompios also had a bug: the condition used || instead of &&, making it always true (a tautology). This commit: - Extracts the copy logic into a new setup_qemu_static() function in common.sh, fixing the || to && bug and adding arch-match escape hatches - Fixes the aarch64->armv7l case to copy qemu-arm-static (not qemu-aarch64-static) - Replaces both inline copy blocks with calls to setup_qemu_static() - Adds 24 new test cases covering all host/target/OS combinations for the QEMU binary copy logic Related to PR #261 and issue #262. Co-authored-by: Cursor <cursoragent@cursor.com>
guysoft
added a commit
that referenced
this pull request
Feb 18, 2026
…y logic The QEMU binary copy logic was duplicated between execute_chroot_script() in src/custompios and chroot_correct_qemu() in src/common.sh. The inline version in custompios also had a bug: the condition used || instead of &&, making it always true (a tautology). This commit: - Extracts the copy logic into a new setup_qemu_static() function in common.sh, fixing the || to && bug and adding arch-match escape hatches - Fixes the aarch64->armv7l case to copy qemu-arm-static (not qemu-aarch64-static) - Replaces both inline copy blocks with calls to setup_qemu_static() - Adds 24 new test cases covering all host/target/OS combinations for the QEMU binary copy logic Related to PR #261 and issue #262. Co-authored-by: Cursor <cursoragent@cursor.com>
Owner
|
Unit test in #270 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.